[HVM] More MCA MSRs to ignore

Signed-off-by: Tim Deegan <Tim.Deegan@xensource.com>

diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c
index 7c13950859eef6cc477b92e97dda73d7a07cf86d..e9d3d0162f7e3d2948abaf8d045f646b4d0e9c35 100644 (file)
--- a/xen/arch/x86/hvm/svm/svm.c
+++ b/xen/arch/x86/hvm/svm/svm.c
@@ -2155,6 +2155,11 @@ static void svm_do_msr_access(
             break;
 
         case MSR_IA32_MCG_STATUS:
+        case MSR_IA32_MC0_STATUS:
+        case MSR_K8_MC1_STATUS:
+        case MSR_K8_MC2_STATUS:
+        case MSR_K8_MC3_STATUS:
+        case MSR_K8_MC4_STATUS:
             /* No point in letting the guest see real MCEs */
             msr_content = 0;
             break;

diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c
index 1c22349161fa0fdf87d30283ae9b3913804679cd..519d01879e4717d1e11e040a6e02f1aa4f953c87 100644 (file)
--- a/xen/arch/x86/hvm/vmx/vmx.c
+++ b/xen/arch/x86/hvm/vmx/vmx.c
@@ -2623,6 +2623,11 @@ static int vmx_do_msr_read(struct cpu_user_regs *regs)
     case MSR_IA32_VMX_BASIC...MSR_IA32_VMX_PROCBASED_CTLS2:
         goto gp_fault;
     case MSR_IA32_MCG_STATUS:
+    case MSR_IA32_MC0_STATUS:
+    case MSR_K8_MC1_STATUS:
+    case MSR_K8_MC2_STATUS:
+    case MSR_K8_MC3_STATUS:
+    case MSR_K8_MC4_STATUS:
         /* No point in letting the guest see real MCEs */
         msr_content = 0;
         break;